From: Georges Basile Stavracas Neto Date: Fri, 29 Nov 2019 15:29:41 +0000 (-0300) Subject: screenShield: Only animate the unlock dialog X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~777^2^2~124 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=c1ee656c350c9154af84e8f00c792d1add9ba0a5;p=gnome-shell.git screenShield: Only animate the unlock dialog Remove the slide-up-down animation from the lock shield. https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/872 --- diff --git a/js/ui/screenShield.js b/js/ui/screenShield.js index faa1b666e..99f1bcaf5 100644 --- a/js/ui/screenShield.js +++ b/js/ui/screenShield.js @@ -380,7 +380,7 @@ var ScreenShield = class { this._lockScreenState = MessageTray.State.HIDING; - this._lockScreenGroup.remove_all_transitions(); + this._lockDialogGroup.remove_all_transitions(); if (animate) { // Tween the lock screen out of screen @@ -388,16 +388,10 @@ var ScreenShield = class { // use the same speed regardless of original position // if velocity is specified, it's in pixels per milliseconds let h = global.stage.height; - let delta = h + this._lockScreenGroup.translation_y; + let delta = h + this._lockDialogGroup.translation_y; let velocity = global.stage.height / CURTAIN_SLIDE_TIME; let duration = delta / velocity; - this._lockScreenGroup.ease({ - translation_y: -h, - duration, - mode: Clutter.AnimationMode.EASE_IN_QUAD, - }); - this._lockDialogGroup.ease({ translation_y: -h, duration, @@ -460,14 +454,6 @@ var ScreenShield = class { let fadeToBlack = params.fadeToBlack; if (params.animateLockScreen) { - this._lockScreenGroup.translation_y = -global.screen_height; - this._lockScreenGroup.remove_all_transitions(); - this._lockScreenGroup.ease({ - translation_y: 0, - duration: MANUAL_FADE_TIME, - mode: Clutter.AnimationMode.EASE_OUT_QUAD, - }); - this._lockDialogGroup.translation_y = -global.screen_height; this._lockDialogGroup.remove_all_transitions(); this._lockDialogGroup.ease({